MIPS: octeon: Add support for the UBNT E200 board

Add support for the UBNT E200 board (EdgeRouter/EdgeRouter Pro 8 port).

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
[bwh: Forward-ported to 3.17: adjust context]

Gbp-Pq: Topic features/mips
Gbp-Pq: Name MIPS-octeon-Add-support-for-the-UBNT-E200-board.patch

diff --git a/arch/mips/cavium-octeon/executive/cvmx-helper-board.c b/arch/mips/cavium-octeon/executive/cvmx-helper-board.c
index ab8362e04461ef2fd95e54aa7778b56c4dfe8dfb..7f2ca071b3c1eb41b968864c59303cac1b9c3d9e 100644 (file)
--- a/arch/mips/cavium-octeon/executive/cvmx-helper-board.c
+++ b/arch/mips/cavium-octeon/executive/cvmx-helper-board.c
@@ -173,6 +173,8 @@ int cvmx_helper_board_get_mii_address(int ipd_port)
                        return 7 - ipd_port;
                else
                        return -1;
+       case CVMX_BOARD_TYPE_UBNT_E200:
+               return -1;
        case CVMX_BOARD_TYPE_KONTRON_S1901:
                if (ipd_port == CVMX_HELPER_BOARD_MGMT_IPD_PORT)
                        return 1;
@@ -411,6 +413,7 @@ enum cvmx_helper_board_usb_clock_types __cvmx_helper_board_usb_get_clock_type(vo
        case CVMX_BOARD_TYPE_LANAI2_G:
        case CVMX_BOARD_TYPE_NIC10E_66:
        case CVMX_BOARD_TYPE_UBNT_E100:
+       case CVMX_BOARD_TYPE_UBNT_E200:
                return USB_CLOCK_TYPE_CRYSTAL_12;
        case CVMX_BOARD_TYPE_NIC10E:
                return USB_CLOCK_TYPE_REF_12;

diff --git a/arch/mips/include/asm/octeon/cvmx-bootinfo.h b/arch/mips/include/asm/octeon/cvmx-bootinfo.h
index 62787765575efff0baee2c0b67f1c6fb4afcb51e..8cd81f729b3a5ec195199412e80c96347d8ea46a 100644 (file)
--- a/arch/mips/include/asm/octeon/cvmx-bootinfo.h
+++ b/arch/mips/include/asm/octeon/cvmx-bootinfo.h
@@ -295,6 +295,7 @@ enum cvmx_board_types_enum {
         */
        CVMX_BOARD_TYPE_CUST_PRIVATE_MIN = 20001,
        CVMX_BOARD_TYPE_UBNT_E100 = 20002,
+       CVMX_BOARD_TYPE_UBNT_E200 = 20003,
        CVMX_BOARD_TYPE_CUST_DSR1000N = 20006,
        CVMX_BOARD_TYPE_KONTRON_S1901 = 21901,
        CVMX_BOARD_TYPE_CUST_PRIVATE_MAX = 30000,
@@ -396,6 +397,7 @@ static inline const char *cvmx_board_type_to_string(enum
                    /* Customer private range */
                ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_PRIVATE_MIN)
                ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_UBNT_E100)
+               ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_UBNT_E200)
                ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_DSR1000N)
                ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_KONTRON_S1901)
                ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_PRIVATE_MAX)